From 5714bf6ae652b1503022419f9ad766c9c504454b Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Mon, 17 Nov 2025 12:02:30 +0100 Subject: [PATCH] build: install libubox MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Install libubox and properly use it by adding it to PATH and LD_LIBRARY_PATH. This is needed for tests using `jshn` which are executed with devel-build.sh and Github CI. Signed-off-by: Álvaro Fernández Rojas Link: https://github.com/openwrt/libubox/pull/34 --- .github/workflows/ci.yml | 3 +++ scripts/devel-build.sh | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bde3e2f..ccacfc1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -198,6 +198,7 @@ jobs: mkdir -p ${GITHUB_WORKSPACE}/build mkdir -p ${GITHUB_WORKSPACE}/depends/lua echo "${GITHUB_WORKSPACE}/build/bin" >> $GITHUB_PATH + echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/build/lib:${{ env.LD_LIBRARY_PATH }}" >> $GITHUB_ENV - name: Build json-c working-directory: depends/json-c @@ -230,8 +231,10 @@ jobs: -DBUILD_EXAMPLES=ON \ -DUNIT_TESTING=ON \ -DLUAPATH=${GITHUB_WORKSPACE}/build/lib/lua \ + --install-prefix ${GITHUB_WORKSPACE}/build \ -B . -S . make + make install - name: Test libubox run: | diff --git a/scripts/devel-build.sh b/scripts/devel-build.sh index 46516ca..2b33ce5 100755 --- a/scripts/devel-build.sh +++ b/scripts/devel-build.sh @@ -23,6 +23,10 @@ DEPSDIR="${BUILDDIR}/depends" [ -e "${BUILDDIR}" ] || mkdir "${BUILDDIR}" [ -e "${DEPSDIR}" ] || mkdir "${DEPSDIR}" +# Prepare env +export LD_LIBRARY_PATH="${BUILDDIR}/lib:${LD_LIBRARY_PATH:-}" +export PATH="${BUILDDIR}/bin:${PATH:-}" + # Download deps cd "${DEPSDIR}" [ -e "json-c" ] || git clone https://github.com/json-c/json-c.git @@ -58,8 +62,13 @@ cmake \ -S . \ -B "${BUILDDIR}" \ -DCMAKE_PREFIX_PATH="${BUILDDIR}" \ + --install-prefix "${BUILDDIR}" \ ${BUILD_ARGS} -make -C "${BUILDDIR}" all test CTEST_OUTPUT_ON_FAILURE=1 +make -C "${BUILDDIR}" +make -C "${BUILDDIR}" install + +# Test libubox +make -C "${BUILDDIR}" test CTEST_OUTPUT_ON_FAILURE=1 set +x echo "✅ Success - the libubox library is available at ${BUILDDIR}" -- 2.30.2